Rollup of 11 pull requests #51930

Mark-Simulacrum · 2018-06-30T00:53:01Z

Successful merges:

Implement PartialEq between &str and OsString #51178 (Implement PartialEq between &str and OsString)
hygiene: Implement transparent marks and use them for call-site hygiene in proc-macros #51762 (hygiene: Implement transparent marks and use them for call-site hygiene in proc-macros)
Do not allow LLVM to increase a TLS's alignment on macOS. #51828 (Do not allow LLVM to increase a TLS's alignment on macOS.)
Fix some doc links #51853 (Fix some doc links)
Point to lifetime spans on lifetime errors #51862 (Point to lifetime spans on lifetime errors)
Update liblibc #51864 (Update liblibc)
Require type is sized in wfcheck.check_item_type for externed DSTs, c… #51867 (Require type is sized in wfcheck.check_item_type for externed DSTs, c…)
Suggest correct comparison against negative literal #51883 (Suggest correct comparison against negative literal)
Fix inconsequential typo in GlobalAlloc doc example #51890 (Fix inconsequential typo in GlobalAlloc doc example)
use literal span for concrete type suggestion #51920 (use literal span for concrete type suggestion)
improve the error message when #[panic_implementation] is missing #51921 (improve the error message when #[panic_implementation] is missing)

Failed merges:

When parsing as emplacement syntax (`x<-1`), suggest the correct syntax for comparison against a negative value (`x< -1`).

Allows for example `os_string == "something"`

Fixes rust-lang#51874.

closes rust-lang#51341

`$crate` is not resolved at def-site of a macro, but rather at "transitive def-site"

…onSapin Implement PartialEq between &str and OsString This fixes rust-lang#49854. It allows equality comparison between `OsString` values and `str` references, such as `os_string == "something"`.

hygiene: Implement transparent marks and use them for call-site hygiene in proc-macros Fixes rust-lang#50050

…xcrichton Do not allow LLVM to increase a TLS's alignment on macOS. This addresses the various TLS segfault on macOS 10.10. Fix rust-lang#51794. Fix rust-lang#51758. Fix rust-lang#50867. Fix rust-lang#48866. Fix rust-lang#46355. Fix rust-lang#44056.

@steveklabnik

…mertj Fix some doc links The futures crate CI always fails because of these intra doc links. I hope that this will fix this issue. r? @steveklabnik @cramertj Edit: I added @steveklabnik as reviewer because this PR also adjusts a link in `src/libstd/error.rs`

…akis Point to lifetime spans on lifetime errors

Update liblibc This updates the libc submodule

Require type is sized in wfcheck.check_item_type for externed DSTs, c… …loses rust-lang#36122 Continuing rust-lang#50126.

…rkor Suggest correct comparison against negative literal When parsing as emplacement syntax (`x<-1`), suggest the correct syntax for comparison against a negative value (`x< -1`). Fix rust-lang#45651.

Fix inconsequential typo in GlobalAlloc doc example

@estebank

…estebank use literal span for concrete type suggestion Fixes rust-lang#51874. r? @estebank

@nagisa

improve the error message when `#[panic_implementation]` is missing closes rust-lang#51341 r? @nagisa cc @phil-opp

Mark-Simulacrum · 2018-06-30T00:53:14Z

@bors r+ p=10

bors · 2018-06-30T00:53:15Z

📌 Commit b7bd4aa has been approved by Mark-Simulacrum

bors · 2018-06-30T02:57:41Z

⌛ Testing commit b7bd4aa with merge 5deba6bf40808d6b0fbb1d81095134b7a48002aa...

bors · 2018-06-30T04:03:10Z

💔 Test failed - status-appveyor

kennytm · 2018-06-30T06:23:04Z

Failing test for cargo. I suspect #51867.

---- doc::doc_target stdout ----
running `C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\cargo.exe doc --target arm-unknown-linux-gnueabihf --verbose`
thread 'doc::doc_target' panicked at '
Expected: execs
    but: exited with exit code: 101
--- stdout
--- stderr
 Documenting foo v0.0.1 (file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t484/foo)
     Running `rustdoc --crate-name foo src\lib.rs --target arm-unknown-linux-gnueabihf -o C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\arm-unknown-linux-gnueabihf\doc -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\arm-unknown-linux-gnueabihf\debug\deps -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\debug\deps`
error: requires `sized` lang_item
error: Could not document `foo`.
Caused by:
  process didn't exit successfully: `rustdoc --crate-name foo src\lib.rs --target arm-unknown-linux-gnueabihf -o C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\arm-unknown-linux-gnueabihf\doc -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\arm-unknown-linux-gnueabihf\debug\deps -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\debug\deps` (exit code: 101)
', tools\cargo\tests\testsuite\hamcrest.rs:13:9
note: Run with `RUST_BACKTRACE=1` for a backtrace.
failures:
    doc::doc_target

The test in question:

https://github.com/rust-lang/cargo/blob/94f7058a483b05ad742da5efb66dd1c2d4b8619c/tests/testsuite/doc.rs#L762-L802

bors · 2018-06-30T16:23:15Z

☔ The latest upstream changes (presumably #51828) made this pull request unmergeable. Please resolve the merge conflicts.

MajorBreakfast and others added 30 commits June 27, 2018 20:22

Fix doc links

30d825c

Update liblibc

64f8e3b

Require type is sized in wfcheck.check_item_type for externed DSTs, c…

fb58db4

…loses rust-lang#36122

Point at lifetimes instead of def span for E0195

cd8ca26

Point to lifetime in fn definition on lifetime error note

5436a5c

Extend support to get_generics for all NodeItems

3005162

Also point to free named region on lifetime errors

03bcebb

review comments: unify duplicated code

9a9b747

Fix rebase

8449c5a

Suggest correct comparison against negative literal

23d59d0

When parsing as emplacement syntax (`x<-1`), suggest the correct syntax for comparison against a negative value (`x< -1`).

Fix inconsequential typo in GlobalAlloc doc example

d6cf182

Do not allow LLVM to increase a TLS's alignment on macOS.

52b7eb9

Implement PartialEq between &str and OsString

0250302

Allows for example `os_string == "something"`

Fix stability attributes

fdcee4d

Add run-pass test

fbd3c92

use literal span for concrete type suggestion

28c4813

Fixes rust-lang#51874.

improve the error message when #[panic_implementation] is missing

faaf250

closes rust-lang#51341

update another cfail test

ee52862

resolve: Cleanup resolve_crate_root

1328bde

expansion: Give names to some fields of SyntaxExtension

09856c8

hygiene: Implement transparent marks

99ecdb3

proc-macro: Use transparent marks for call-site hygiene

297109e

Fortify dummy span checking

9f92fce

Restore the old behavior of $crate in nested macro_rules

b69d511

`$crate` is not resolved at def-site of a macro, but rather at "transitive def-site"

Address comments

84f1bc8

Rollup merge of rust-lang#51178 - GabrielMajeri:os-str-compare, r=Sim…

12247fd

…onSapin Implement PartialEq between &str and OsString This fixes rust-lang#49854. It allows equality comparison between `OsString` values and `str` references, such as `os_string == "something"`.

Rollup merge of rust-lang#51762 - petrochenkov:oh-hi-mark, r=oli-obk

d562bff

hygiene: Implement transparent marks and use them for call-site hygiene in proc-macros Fixes rust-lang#50050

Rollup merge of rust-lang#51862 - estebank:lifetime-spans, r=nikomats…

b3f8989

…akis Point to lifetime spans on lifetime errors

Mark-Simulacrum added 6 commits June 29, 2018 18:52

Rollup merge of rust-lang#51864 - est31:libc_update, r=alexcrichton

bea664b

Update liblibc This updates the libc submodule

Rollup merge of rust-lang#51867 - krk:issue-36122, r=petrochenkov

de85644

Require type is sized in wfcheck.check_item_type for externed DSTs, c… …loses rust-lang#36122 Continuing rust-lang#50126.

Rollup merge of rust-lang#51883 - estebank:placement-suggestion, r=va…

2223cc8

…rkor Suggest correct comparison against negative literal When parsing as emplacement syntax (`x<-1`), suggest the correct syntax for comparison against a negative value (`x< -1`). Fix rust-lang#45651.

Rollup merge of rust-lang#51890 - Ixrec:patch-3, r=alexcrichton

cf957c8

Fix inconsequential typo in GlobalAlloc doc example

Rollup merge of rust-lang#51920 - euclio:concrete-type-suggestion, r=…

b50a6ba

…estebank use literal span for concrete type suggestion Fixes rust-lang#51874. r? @estebank

Rollup merge of rust-lang#51921 - japaric:panic-impl-error, r=nagisa

b7bd4aa

improve the error message when `#[panic_implementation]` is missing closes rust-lang#51341 r? @nagisa cc @phil-opp

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 30, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 30, 2018

kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 30, 2018

kennytm closed this Jun 30, 2018

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Rollup of 11 pull requests #51930

Rollup of 11 pull requests #51930

Uh oh!

Mark-Simulacrum commented Jun 30, 2018

Uh oh!

Mark-Simulacrum commented Jun 30, 2018

Uh oh!

bors commented Jun 30, 2018

Uh oh!

bors commented Jun 30, 2018

Uh oh!

bors commented Jun 30, 2018

Uh oh!

kennytm commented Jun 30, 2018

Uh oh!

bors commented Jun 30, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Uh oh!

Rollup of 11 pull requests #51930

Rollup of 11 pull requests #51930

Uh oh!

Conversation

Mark-Simulacrum commented Jun 30, 2018

Uh oh!

Mark-Simulacrum commented Jun 30, 2018

Uh oh!

bors commented Jun 30, 2018

Uh oh!

bors commented Jun 30, 2018

Uh oh!

bors commented Jun 30, 2018

Uh oh!

kennytm commented Jun 30, 2018

Uh oh!

bors commented Jun 30, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants